Skip to content

Reinstate block order in testSnapshotShutdownProgressTracker #135835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 6, 2025
Merged

Reinstate block order in testSnapshotShutdownProgressTracker #135835

merged 2 commits into from
Oct 6, 2025
+16 −16

Conversation

DaveCTurner
Copy link
Contributor

Partial revert of #134926

@DaveCTurner DaveCTurner added >test Issues or PRs that are addressing/adding tests :Distributed Indexing/Distributed A catch all label for anything in the Distributed Indexing Area. Please avoid if you can. auto-backport Automatically create backport pull requests when merged v9.1.6 v9.0.9 v9.2.1 v9.3.0 labels Oct 2, 2025
@elasticsearchmachine elasticsearchmachine added the Team:Distributed Indexing Meta label for Distributed Indexing team label Oct 2, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing)

@DaveCTurner
Copy link
Contributor Author

I think the indexAllShardsToAnEqualOrGreaterMinimumSize call should be a sufficient fix here, and extending the block weakens the test a little (i.e. it might fail to detect a different bug) so I'd rather we went back to how things were in this regard.

@DaveCTurner DaveCTurner merged commit 2586fbd into elastic:main Oct 6, 2025
34 checks passed
@DaveCTurner DaveCTurner deleted the 2025/10/02/reorder-block-testSnapshotShutdownProgressTracker branch October 6, 2025 11:48
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Oct 6, 2025
@DaveCTurner
Reinstate block order in testSnapshotShutdownProgressTracker (elast…
4b2b780 
…ic#135835)

Partial revert of elastic#134926
@DaveCTurner DaveCTurner mentioned this pull request Oct 6, 2025
Merged
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
❌ 9.1 Commit could not be cherrypicked due to conflicts
❌ 9.0 Commit could not be cherrypicked due to conflicts
✅ 9.2

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 135835

DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Oct 6, 2025
@DaveCTurner
Reinstate block order in testSnapshotShutdownProgressTracker
9d44a24 
Partial revert of elastic#134926
Backport of elastic#135835 to 9.1
@DaveCTurner DaveCTurner mentioned this pull request Oct 6, 2025
Merged
DaveCTurner added a commit to DaveCTurner/elasticsearch that referenced this pull request Oct 6, 2025
@DaveCTurner
Reinstate block order in testSnapshotShutdownProgressTracker
6765b34 
Partial revert of elastic#134926
Backport of elastic#135835 to 9.0
@DaveCTurner DaveCTurner mentioned this pull request Oct 6, 2025
Merged
elasticsearchmachine pushed a commit that referenced this pull request Oct 6, 2025
@DaveCTurner
Reinstate block order in testSnapshotShutdownProgressTracker (#135835…
8a779c4 
…) (#136014)

Partial revert of #134926
elasticsearchmachine pushed a commit that referenced this pull request Oct 6, 2025
@DaveCTurner
Reinstate block order in testSnapshotShutdownProgressTracker (#136015)
8778a2f 
Partial revert of #134926
Backport of #135835 to 9.1
elasticsearchmachine pushed a commit that referenced this pull request Oct 6, 2025
@DaveCTurner
Reinstate block order in testSnapshotShutdownProgressTracker (#136016)
267c6bf 
Partial revert of #134926
Backport of #135835 to 9.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshua-adams-1 joshua-adams-1 joshua-adams-1 approved these changes

Assignees
No one assigned
Labels
auto-backport Automatically create backport pull requests when merged backport pending :Distributed Indexing/Distributed A catch all label for anything in the Distributed Indexing Area. Please avoid if you can. Team:Distributed Indexing Meta label for Distributed Indexing team >test Issues or PRs that are addressing/adding tests v9.0.9 v9.1.6 v9.2.1 v9.3.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DaveCTurner @elasticsearchmachine @joshua-adams-1